Merge from emacs-24; up to r111242
authorGlenn Morris <rgm@gnu.org>
Sun, 10 Feb 2013 01:56:25 +0000 (17:56 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 10 Feb 2013 01:56:25 +0000 (17:56 -0800)
commit8b34d015f1bb9af52028a5037a0d6047e638a95d
treee147ea74f1fceba1a18f46cfe2c584fa03b597df
parente4b1f23a13cf18363defc7f6cbd35979b1344562
parent2a8870777ffdab83b36916d9e35b977efcccdd07
Merge from emacs-24; up to r111242
doc/emacs/ChangeLog
doc/emacs/trouble.texi
doc/lispref/ChangeLog
etc/NEWS
etc/TODO
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/mail/emacsbug.el